Merge conflicts solutioned
[RRRRHHHH_Code] / ruralHouses client / src / domain /
drwxr-xr-x   ..
-rw-r--r-- 1223 Account.java
-rw-r--r-- 1326 Administrator.java
-rw-r--r-- 1456 Booking.java
-rw-r--r-- 678 Client.java
-rw-r--r-- 856 Districs.java
-rw-r--r-- 1146 HouseFeatures.java
-rw-r--r-- 2899 Offer.java
-rw-r--r-- 1824 Owner.java
-rw-r--r-- 3884 RuralHouse.java